merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 18 May 2011 05:58:40 +0000 (14:58 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 18 May 2011 05:58:40 +0000 (14:58 +0900)

Trivial merge